[automerger skipped] Fix non-Android build targets am: eca87cb9ca am: b5f684bc91
am: 544a15ba29 -s ours
am skip reason: change_id I1c195267e287a84a21c588bd61d7c452bff6cfbe with SHA1 d54706cf67 is in history

Change-Id: I27dbce639cd3522e7fc00962e71bec5a2c5b9419