Merge "Migrate core.current.stubs generation to Soong." am: 1209f65aac
am: b1bce09e62

Change-Id: I0442dada23ea7dc698d642262c42a28475694490