Ported all original Android-specific patches. Change-Id: I2c5801a92d783e2c5cba72147d9fb777ad7c8443
Attach a file by drag & drop or click to upload
