Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: a51d11f27e
am: d356a19fdd

Change-Id: I24e2487d6ab6c0be53b440198102585c596cde59