Fix non-Android build targets am: eca87cb9ca
am: b5f684bc91

Change-Id: Iadf848c55022cc85a277c1d015f2e2a5b04e20d4