video-rice: Eliminated more cosmetic differences with upstream.
video-rice: Restored missing source files from upstream.

These may not be compatible with Android, but it doesn't matter since
the makefile (Android.mk) already excludes them from the compile, and
the source files exclude them from the `#include` statements.