Merge "Don't recompute location of AndroidManifest.xml"
am: 1b02cfd8ab

Change-Id: Ic2caebb25ca420c2595919ee0ad08214aba309d2