am: 98f3d0b5 * commit '98f3d0b5': Refactor use of __ANDROID__ macro Change-Id: Ie72a6ef5bd67c6c8cddbee7b7d49229d48661cb9