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

Change-Id: I71e9479f02951f54944ab0483435df8ce78cf462