Track android-mock and javasqlite from CM

Change-Id: Ibfa7879653b20ec95a5af9037d7efdc71c62b477