Fix HAL and AIDL files to be consistent with API generation tool.

Bug: 161426966
Test: generate_api.sh
Change-Id: I4f4cc108ccdf2f37a1a7fa154ba8e8a186295276
5 files changed