Change ANDROIDCOMMONS to COMMONSANDROID

Change-Id: I58e595aec2d4e0c619c44fe5d8e3554b90b53385