Feature #4977: Add new classes to android mk