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

Change-Id: If5461b8d46fb672de99714e5df18528120ee6db2