tree 324c0046d178dd26371d35205e7632fcc16545c5
parent 99ff65ee406a87d15ee6a1185fcc247617fd3b11
parent 9cc62ce35d099acf7897b6259228479737521709
author Nick Kralevich <nnk@google.com> 1494602975 -0700
committer Nick Kralevich <nnk@google.com> 1494603118 -0700

Merge remote-tracking branch 'aosp/upstream-master' into mymerge

Please see go/android-upstream for merging a remote tracking branch into
Android. Automatic replication is already enabled for external/selinux.
This just merges those changes into Android's master branch.

Test: Android compiles and no obvious problems.
Bug: 31559095
Change-Id: Icc1961056366997632dea7d958e08593c27ab632