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

Change-Id: I7e9c0510188fa9061f5a03737b6c881c266df15a