Fix non-Android build targets
am: eca87cb9ca

Change-Id: I4b0305619c91041bf7b844201f23437df06864b9