Merge "Updated static_java_library.mk to support proguard options."