ndk-r16-beta2
Merge "Remove pre-ICS crap." into ndk-release-r16