Android N MR2 Preview 2
Merge "Removed littlemock dependency and cleanup"