am ba0c668f: Merge "bionic: Do not use magic number for portability"

* commit 'ba0c668feca851fd52359bee4174a232f27697b4':
  bionic: Do not use magic number for portability