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

Change-Id: I9a4925755505ac25cb8d410bbd4d026453d64175