Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96 am: a33407d2f8
am: 53511e1196

Change-Id: Id4486595ce42e524c7db17b09e120f132976599a