This reverts commit 76dc595d. Bug: 37291237 Test: compiles and 2016, 2017 device works with other CLs in this topic.