Merge "Split android-style.xml into modules for checkstyle." am: 806abc2838 am: 36feb7056c am: bd219c8a33
am: 1507173150

Change-Id: I4c2dbc5253be9f177322de272e8c7830103013ec