Merge "Use libnativewindow's AHardwareBuffer directly" am: d3a512cbd7
am: e5ed688ebf

Change-Id: Id5f56bd7449b5fe68812e6c50df8befd4f9c9e69