This reverts commit 9551384f65. 5bedfee448 is a better solution for the same problem. Bug: 279247159 Test: m checkbuild (presubmit) Change-Id: Ifd3117a4450b5275c09258d1ce896adb41a75158
9551384f65
5bedfee448