Android N Preview 4 (NPD56N)
Merge "Remove deprecated Android.mk files"