Merge "Remove superfluous use of no_framework_libs: true" into qt-dev-plus-aosp
am: 6ac0ab0d15

Change-Id: Iba4de7832cc238feb20308b5631d63889e4549ac