Merge "Format Android.bp in simulator_app." into tm-dev