Fix aosp_arm build for ODR
am: 22dd0fee8f

Change-Id: I104b3b5f712e373491c8b871096dfb613d88989b