[automerger skipped] Merge "Replace no_framework_libs: true with sdk_version:...
[automerger skipped] Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: ff32698f
am: daf0bb86 -s ours
am skip reason: change_id I0260942108a13cc5e9bed1d6005abfb8daffe0ac with SHA1 8fcace44 is in history
Change-Id: I909b892353da2cd927b87470f56f7c4892202e8c