tree a4f665ace68e21f2961ce96b3eb15e503a5922c0
parent 4e9f062ebb7419660bf489bf10321cbf48a41b2b
parent b161c42905ef481ab28aa31aaab2216221c618ec
author Yifan Hong <elsk@google.com> 1575577236 -0800
committer android-build-merger <android-build-merger@google.com> 1575577236 -0800

Merge changes from topic "no_hal_static_libs"
am: b161c42905

Change-Id: I63c5289f464e0a598112c7f41e223bf3780840e3