Merge "Remove MODULE_LICENSE_APACHE2 from dalvik" am: d6b330660f Change-Id: I9b789c0ccbd43521a3c05fa984deb416c3b0f010