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

Change-Id: Iaf2be8c77e370b421708d53c57706e1f92ea2147