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

Change-Id: I211df23fe148024a7fb415421f36f19f63e6cbcc