prepare for aokp/jb-mr1

Change-Id: I64a4b4b1f75903eef4d656d39251dc18c70e5fc3
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>