Merge "Better aidl generated dependency" into klp-dev