Merge changes Id701f7c7,I660bbcd1

* changes:
  Add Bitmap#getHardwareBuffer
  [HWUI] Remove private references to AHardwareBuffer