Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into qt-dev-plus-aosp
am: 23b3ebfd24

Change-Id: Iad64ba777e996861fff3062a37c150a35a6d3618