Merge "Fix aapt2 JavaClassGenerator Maybe#value() call before check"