Merge changes from topic 'hidl-vendor-available' into oc-dev

* changes:
  Update makefiles (2/2).
  Update makefiles.