Merge \"Reformat files using Android-style imports.\"
am: 6e739acde3

Change-Id: I4cbdd8078888097b79182bacdc87b10c32f9826c