am: 97a58547 * commit '97a58547': Refactor use of __ANDROID__ macro Change-Id: I7e97e86e9687ed93da5fd621db5d29d0dc22ff96