resolve merge conflicts of 0ab28b78 to nyc-mr1-dev-plus-aosp
Tucker Sylvestro authored
Test: Built with ". build/envsetup.sh && lunch shamu-eng && make -j32"

Change-Id: I4b3081c2b9091fa2d66c717f5d57dc6e567c50e2
9c28dd5f