Android n preview 1
Merge ""#warning" conflict with -Werror"