switch to merged android_build

Change-Id: I8fdfb62ae6a65749e506afa5055d6ace123a284e