Merge "Update HIDL makefiles." into oc-mr1-dev
am: 7dcc345b64  -s ours

Change-Id: I955d0c273d38a705b72ad987c4cf5fc49779e571