Merge "Revert "preloaded-classes: remove core HIDL libs"" am: 6e9ce1a296
am: 1266b4f491

Change-Id: I3a87c6f43a86d17d0f1b071c2c831c4e03ce2e31