Merge "OsTest: Reformat according to 4-space indent "AndroidStyle 4"."