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

Change-Id: I8ff3132f56c2ec36cfd1451a1f5d6f9f832e9146