Stop including version_defaults.mk am: 2e3cbcff0e
am: 3d1ba39aab

Change-Id: I307184b391a0b6cfb6e1509accd2b9783f9c5926