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

Change-Id: I98abda6234ed37e6b8a8938f8c3399740a1ee1ed