2014071501 - Android updates Pass 1

Trying to get working on Android (Pass 1)