Merge "Don't use libs when header_libs is enough" am: 6729bce6c3 am: 984538bfdd
am: c44d5365c2

Change-Id: I0d32efa734b47004b47deb236f4845efaa3af463