Update AAPT/AAPT2 prebuilts to OPR1.170404.001
am: 7d14941d2a

Change-Id: I8f776e7987e4205cc677c2489dcb032b818bf8c3