some fixes for andriod

Change-Id: I53bd827748a3ee2bf289136d8acd35d70e168588
some fixes for andriod

Change-Id: Id8ae123282a5d0c5c4d34a0a8c83877a56d5a644