This reverts commit 31d0688d. Reason for revert: cause build breakage on stage-aosp-master Change-Id: I7626f8ec36caaaa5eb4c7e9891565fc164a7f6c7