am 65dcafc2: Merge "Fix incorrect proguard keepfile generation for fields." into lmp-ub-dev

* commit '65dcafc24f6b1a1e5cae13f1af9b719789ee5620':
  Fix incorrect proguard keepfile generation for fields.