Merge "Add some Android-specific kernel options."