Merge "Update indentation to 2 spaces for build_mixed" am: 1ee5d4e60f
am: d71d101653

Change-Id: If9ec9b2d9fb07d85a6709957e10d654b2b1464dd