Merge "Do not package res unless RS target API < 21" am: 9aff695ab8
am: 1d42ae066f

Change-Id: I7d17b97041a4598e8ef8cbd006a15eb5eaae54ca