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

Change-Id: I55d8c73df0ce751472e58a9ae505c94edc90c68e