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

Change-Id: I9b66f1989c1b11d6caff7c30630b51d25e5822b6