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

Change-Id: Id8bd2416528e977246f92eacf47b279f3c81a4ad