ML3 build tweaks. Do not merge.

Change-Id: I98f3ae796ed9026c755df8174baee2584bbd8ae8