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

Change-Id: I4ebf32377220162200db6d24ddbc4d9e09f87cee