Merge "Don't clean generated java sources when AIDL list changes"