Merge "Make aapt2 dump badging print overlay info"