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