Merge "Do not package res unless RS target API < 21" into oc-dev