am: adc90030 * commit 'adc90030': Refactor use of __ANDROID__ macro Change-Id: Ia13fed2ed6e7a6ff1f0719d8f93699d657b1c0af