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

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