Merge changes I7b2fc184,I71f6fcaf

* changes:
  Move generated aidl/logtags java classes to a subfolder
  Fix multiple output file generation for AAPT2