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

Change-Id: I6a30cb3c2a9aec53ee5f322f3fd9127818ee933e