Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev am: 9b581c7bc1
am: 8284349fc9

Change-Id: Iadd7362ae8456279ebec3a4577ba5be0c8bf19d7