Update and rename android_composite.h to android.h