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

Change-Id: I7bb06fe6c2ecc81d7997c2efee8bfb029b61e994