Android n mr1 preview 1
Merge "Remove unused include."
am: 1bdcd4fe9b

Change-Id: Ia757c04441404f38a59f535ed5dfdaa8a2bb436f