Merge "AIDEGen: Fix aidegen/run_tests.sh failed."
am: 6c64c06cfa

Change-Id: I763437fd95b3c40d40958714caf2187000e869fa