Merge "Expose kDefaultAidlMinorVersion."