Merge changes from topic "no_hal_static_libs" am: b161c42905
am: c112f30c9b

Change-Id: I149cd9d4c3b9c4b71d0c1b4eafc54d7356d90211