Merge "Update runtime hints for master and Nougat"
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 30 Mar 2017 21:07:26 +0000 (21:07 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 30 Mar 2017 21:07:27 +0000 (21:07 +0000)

Trivial merge