Merge change 5122

* changes:
  Support AIDL files recently added to Email