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