Merge "Add some Android-specific kernel options."
am: 54f9bd922a

* commit '54f9bd922ac5d4fcfaa34e5878d6de264a565fde':
  Add some Android-specific kernel options.