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

Change-Id: I5ce89cf89447fcde64b45a25af28e8527e9ca1fd