am: 88b89153 * commit '88b89153': Refactor use of __ANDROID__ macro Change-Id: If39216313249d911f4cedba89472ae1e51bb255b