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