Merge "Add HIDL base/manager packages to PRODUCT_BOOT_JARS." into oc-dev