Merge "Add aidl version property to clearkey plugin" into tm-dev