Clean-up and added android_prebuilt to roomservice.xml

Change-Id: I0514ce4bf854452e55b794d7d68e6b80d77a3484