Merge "msm8996: Increase dalvik vm heap size for 480ppi"