Merge remote-tracking branch 'remotes/origin/caf/antclient/features/hidl-support-soong into ant.lnx.3.0