Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
am: 3c6186c474

Change-Id: Id03d6d4af7ea4713bf971d54798a55be086a0ca3