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

Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d