Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
authorXin Li <delphij@google.com>
Sat, 9 Jun 2018 08:54:13 +0000 (01:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Jun 2018 08:54:13 +0000 (01:54 -0700)
am: 5a8888e88d

Change-Id: I1e75407d431ed1a28ee5c94e478d57f0f86f1062


Trivial merge