Merge "Generate Soong based (system/test_)stubs_current jar"
am: 9a6d742b36

Change-Id: I8ec6f422ba93862e41f7b466e09a1e68da563182