Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6' * commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6': Fix proguard flag file dependency.
Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6' * commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6': Fix proguard flag file dependency.