Fix Android-4.2.2_r1 merge derp

Change-Id: I8aec4f639333ce1b8d14c85fe799dfd9109619a2