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

Change-Id: I13006d1ab820171739fa680aabdd661e58cf7c34