updated maven plugin to 3.6.0, ADT 22 - missing aapt.exe after upgrading