Merge "Correct inaccurate comments in build files"
am: f55f221805

Change-Id: Iba1b710e00843d8c35c346d64d33250ce6654956