Track our own dalvik and fw/native

Change-Id: Ibe5d7e492df9b911e526a740ec62c61558443280