Merge "AAPT2: Fix issues with parsing integers + floats"