prepare for aokp/jb-mr1

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