Merge "added BUILD files for proguard 5.3.2"