Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: Ia5d4285f39b774c56887f3209bc7db53a4c544b3
diff --git a/current/android.jar b/current/android.jar
index 2db25f2..411a27c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ