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

Change-Id: I65b83af22f25f98ac3d086d6d50b48aa7e5f25b4