Merge "Remove NDK crtbrand.c." am: fd7a042b05 am: e49af227fb am: 35960122ea
am: 141b508c2b

Change-Id: I4f29fc16523a81356af0bcdb33fb411b8386309c