Merge "AAPT2: Add support to specify stable IDs"