CP: Update runtime hints for master and Nougat
authorKalle Raita <kraita@google.com>
Fri, 31 Mar 2017 19:56:57 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 19:56:57 +0000 (19:56 +0000)
am: 37fdf46649

Change-Id: I87c4498564ffa3e5150e162d305401cdb5b5cb1d


Trivial merge