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

Change-Id: I935fec0bae66f229b14ffa16737d52571c83ca21