Merge remote-tracking branch 'refs/remotes/BR-x86/n7.0-x86'

Conflicts:
	Android.mk
	fs/Ext4.cpp
	fs/F2fs.cpp