Merge "Correcting Buffer Allocation for Shared Display" into mnc-dev am: 6d1537bc60 am: 5410ce3f8e am: 4ef14ee04c am: fec92270b0 am: 19ec51d851 am: 39804d4487 am: 85a0181cef
am: 47b0de3bee

Change-Id: I7bbff5dbb48ebe657acf67bcb4775df257b5c136