Merge "Remove superfluous use of no_framework_libs: true"
am: ee7baf72cf

Change-Id: I044c175d67c4480c39adf00fe69fc8c0b1e62c8c