Merge "core_current does not include framework libraries" am: bf46d96c am: 3704c266 am: eebd7617 am: 0ed07df8 Change-Id: I97df96d7138f654789aabd5433a212a1e71963f2