Merge "Try again - Empty external/littlemock repository as it is no longer needed" am: b401692320
am: 105f5b4352

Change-Id: I086a681d24ecfc40ecd87014459d2dc02d29f09c