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

Change-Id: Ifbde7e8c1638ffc0e43d958715d6939229c8f8ce