Merge from stevenfanwu/emenu_android_client.

rt