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

Change-Id: I93ebabe6eedfde1e8ea40bea46e6a0635fc7be28