Merge "Fix the drawable resource can't be loaded from RRO package"
am: a6f40828e8

Change-Id: I5eb516a0aaeb54ea031a7fd2e95b6776257246d0