Android 04 compelete
Merge pull request #1485 from alim0x/master

Android 04 compelete