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