Merge "Add --non-constant-id to aapt."