Prepare for JellyBean AOSP

Change-Id: I7a3008cf17881550c1e1af3a8bf30816e3aa6d73
3 files changed