Track these through local_manifest instead

Change-Id: Ic28c62d192f0140539cd8d24b355aeaa3a029327