Android 4.0.4 release 1
Merge "[DO NOT MERGE] Drop prebuilt NDK r7b." into ics-mr1