Merge "Fix aapt2 badging return codes"