Merge \"Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am:...
Merge \"Merge \\\"Fix a naming typo for source_build\\\" into nyc-dev am: dfa654ed am: ab1a5e45\" into nyc-mr1-dev-plus-aosp
am: adff15ab
Change-Id: I71c2812be03faa679a0a757c404bc792a0f0d179