Merge "Package core-current-stubs-for-system-modules into the SDK" am: 56d21f5ebb am: 73e25944a0

Change-Id: I6aeef43fe3e2a4e0a2e5a15fc54c1a600b2923e7