Rename makefile to match the name of test.

Change-Id: I00f11f644b92f18f7a139bb8ece67c57a971f17e
Add CustomTarget_android_desktop back.

Change-Id: I4bad098055c6c3b34dd5f02caf17df13cf4df797