merge with dev. Use libs for android 3.0