Change-Id: Ib4991200db9bc64c823c57ed1fba43f836142957 (cherry picked from commit cc57c2f34b936636e9c52dc43689d9386bcd0e35) Conflicts: libgralloc/Android.mk libhwcomposer/Android.mk libqcomui/Android.mk
Change-Id: Ib4991200db9bc64c823c57ed1fba43f836142957 (cherry picked from commit cc57c2f34b936636e9c52dc43689d9386bcd0e35) Conflicts: libgralloc/Android.mk libhwcomposer/Android.mk libqcomui/Android.mk