Track CM's android_build

Change-Id: I0cadc74baba9506a474baeff83986913a0902fe1