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

Change-Id: I47db35c7b2f9343c946f92ece2bb4d1c278db491