Fix Android-4.2.2_r1 merge derp

Change-Id: I2e3f7eac1801aebc88aa51e0543079a4d57a4acd