Merge aapttest into aapt