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

Change-Id: I5933eefba78d0ed3f235eebd64bbe9c8a4eaf06c