am 62f16fe9: am d3373c29: Merge "Better aidl generated dependency" into klp-dev

* commit '62f16fe93deaa451d2bfc2d3409cf6e655513ca3':
  Better aidl generated dependency