Revert "Do not depend on make intermediates for soong generated ..."

Revert submission 33335626-no_deps_required

Reason for revert: Droidmonitor created revert due to b/417259478. Will be verifying through ABTD before submission. 

Fix: 417259478

Reverted changes: /q/submissionid:33335626-no_deps_required

Change-Id: I05b45aef004097c756f6021b5f0f0459c62e3cae