Reconcile with jb-mr1-release - do not merge

Change-Id: I73718e42a2afb6ee8fec129ee89b49070af39b8d
diff --git a/current/android.jar b/current/android.jar
index 613e0c7..411a27c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ