DO NOT MERGE: fix build error caused by incorrect path of RemoteDataSource.h am: f64ced003d  -s ours
am: a1599b921f  -s ours

Change-Id: Idfd856808ba3c4df21cd956104b920f48e5bf15b