Merge "Add HIDL base/manager packages to PRODUCT_BOOT_JARS." into oc-dev am: d75be23640
am: f9c5581621

Change-Id: I02da1a02a136db56e7c8220ab07f09d89f74b230