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

Change-Id: Ia783fc81ac68006192c0932871979a0ffe081879