Merge "Allow building kati & makeparallel with soong" am: 77cde9e244
am: 766eeb747e

* commit '766eeb747ef5714f6027f371394ca08c6bc1057e':
  Allow building kati & makeparallel with soong