Merge "Allow dex2oat to read /apex/apex-info-list.xml"