am d889ce6d: Merge "Fix proguard wrappers." * commit 'd889ce6df1a831f4cff915b4c2a48090ece14b03': Fix proguard wrappers.