Merge changes Id7c0a2f5,I980f6215

* changes:
  Adding 3.0 mapper support to lockAsync
  Adding support for Hal query in AHardwareBuffer isSupported