Fix build error
Merge remote-tracking branch 'common/android-3.0' into bfs_cm
Merge branch 'bfs_cm' of https://github.com/Agent92/scotch into bfs_cm