On branch master - fixed a few Android building error