am ce4edcd3: Merge from jb-mr1-aah-dev

* commit 'ce4edcd3257e88b5068cf62fe9ee6e9ceb817a95':
diff --git a/current/android.jar b/current/android.jar
index 411a27c..1755033 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ