This reverts commit 90153d67e0. Reason for revert: Temporary fix no longer needed; this was only added until an updated prebuilt for the referenced package was merged Bug: 171506470 Test: none Change-Id: Ibd3fec1d2ecd505693b4cf89ee8323eb8a50a604
90153d67e0
2a46c6491f
70100919d0
9e0ab4a327