Merge changes Ia4eb5378,I745031b8 into oc-dev

* changes:
  Mark as vendor_available
  Export headers as libhardware_headers