Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES"
am: 7e3eaeb2e0

Change-Id: Id1de7116263d78d95ab67025dd39cc703fbe7fdf