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

* commit '516dd9426e370464aa4b9d19a6cc0b81bced9eb8':
  Add some Android-specific kernel options.