Merge changes from topic 'fix-hidl-generate' into oc-dev

* changes:
  Update makefiles for c++-sources and c++-headers.
  Update makefiles for c++-sources and c++-headers. (2/2)