Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: 8475fc34a2 am: 14492fe674 am: 7b0e4d64ce
am: 7447d5dc97

Change-Id: I7c29bbe0cdaa9bb386d960eb61a7c45f3292f869