Merge changes from topic "no_hal_static_libs"
am: b161c42905

Change-Id: I63c5289f464e0a598112c7f41e223bf3780840e3