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

Change-Id: I59f542a35b61c8cbc52adbb13c14ff1e2ed230c5