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

Change-Id: I7dfb3667b3666a3a1de7beb2adf9ad0afa9cca24