Merge "Generate Soong based (system/test_)stubs_current jar" am: 9a6d742b36
am: 2f34ff886d  -s ours

Change-Id: I04e054fc48014c58000fdf9df98d90789f854d4a