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

Change-Id: Ia1522334e450ef6298530d9d0a860345c5ff9934