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

Change-Id: I3c126807e8dc354e603baa439e05ac1e5a9c8676