Merge "Merge "jarjar hidl core libs." am: 436e2ad4c7 am: 977fc9bf8e am: 00217ac44b"