Merge "Remove NDK crtbrand.c." am: fd7a042b05
am: e49af227fb

Change-Id: Ic53b5b72d76c3b84a432bc823ea4dcdb52ce68d4