Merge changes I9c735fe2,Ib918b2ed

* changes:
  Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
  Disable auto installclean for AAPT config change