Merge branch android-3.10 into android-tegra-3.10

3c71420 BACKPORT: f2fs: add a max block check for get_data_block_bmap
2564b24 fuse: Add support for d_canonical_path
1201271 vfs: change d_canonical_path to take two paths

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 28271368
Bug: 23904372
Change-Id: I028c95ad17f47a0a75d0bb16a23e12a30e0dee54