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

Change-Id: I7821306a1a8f09511459a716305fbe1da1d83d91