prepare for aokp/jb-mr1

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