Merge changes Ibba49951,I106f1f33 into pi-dev

* changes:
  Use Android.bp for bufferhubd
  Remove NativeBuffer from libbufferhub