Allow git-review of vendor_aokp

Change-Id: Ia7777c562fb13c4dff043dc2efeda510eb1f77e3
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2