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

Change-Id: Ia9ed78fed3146711283f711f51a8729de4fede39