Merge "Do not package res unless RS target API < 21" am: 9aff695ab8 am: 1d42ae066f am: 361e4a110a  -s ours
am: c14caeaf7a

Change-Id: I6ed76c4ff787845438fdadb298a43208c533ec74