am f13231ef: am ea79e65f: Merge change Ib7704386 into eclair

Merge commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5'

* commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,