Restore "Use HAS_BUILD_NUMBER to check engineering build"
am: e4c531c5ee

Change-Id: Ia2c13b664486955344754cc7d6605c97fcd7f35b