Merge "Updated static_java_library.mk to support proguard options." am: 14e5c5975c  -s ours am: fbc9ffd072  -s ours
am: 3faefab6d9  -s ours

Change-Id: I9669ab8df6e668d9d369e3c13b8de2151981cc59