Android N IOT Preview 2 (NIG40)
Merge "Remove deprecated Android.mk files"