Merge "Rename ...stubs-gen to stubs-source to clarify its contents"
am: cdb39a11f2

Change-Id: I6c773fcf9e9af542f1910e34d91d652978f68c4c