This reverts commit 9d37831dd3. Reason for revert: Broke builds with ALLOW_MISSING_DEPENDENCIES=true Change-Id: Ibff79642f747b83364c83d6b298334121028e02d
9d37831dd3