Merge "Do not package res unless RS target API < 21" into oc-dev am: 671fc06b02
am: dfffda92e0

Change-Id: I8d94f7c60fd0af4ccfbe4996dd0c844d426d496b