Track android-visualizer and android-mock from CM

Change-Id: I5e3e4a1c9543c68550042287c38dfb216b0e076d