Merge "aapt: Remove terminal pointer incrementaion"