Merge changes from topic "remove-hidl-boot-jars" am: 82e3d2f066
am: fc8de0d9e3

Change-Id: If4d5c5e99bf605f31371426ab3a5def66f0a0137