android: Make clang happy with braces am: b444932260 am: 8eff5c31a6
am: 22b61727ed

Change-Id: I2b1620f345f13aac0c9c6e992824363f7e339232