Reconcile with jb-mr1-release - do not merge

Change-Id: I4b74d2eaaf4c3d80493ae2f73ffde05bc9a0c381
diff --git a/current/android.jar b/current/android.jar
index 79dd985..411a27c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ