Update to Android ARMv6 stuff

Change-Id: I133f0cda127e077f7327358b29000b109a73d0b6
Add upstream() & mergeupstream() functions to envsetup

source build/envsetup.sh

    mergeupstreamall
or
    cd PROJECT
    mergeupstream

Change-Id: I292489d96a03b7df17af533d783674f77f2155bd