Merge "Use core_current instead of current and no_framework_libs:true" am: 3b1b505671 am: 3bcea82e0e am: 1fc3d05042
am: 60a5a5f706

Change-Id: Id3b702dde2096bbce718912fd6c4f7626304de07