am a76f057a: Merge "Protect from eng vs userdebug build breaks."

* commit 'a76f057af81b7a03c9c18af0bcb763f7e7f03fbf':
  Protect from eng vs userdebug build breaks.