am 56e6fc57: resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp

* commit '56e6fc57387e6b8ff39c0744cf4ee4dd089ae3f1':
  Doc change: Update landing page for kitkat.