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