Merge "Use no_framework_libs: true instead of core_current"
am: a2f0efdf82

Change-Id: I6075c05ddd90c377cfeb6a3800f7f079e8442fb6