Merge "Rename resource drawable to drawable-nodpi for RsStates."