Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES" am: 7e3eaeb2e0 am: b45d6fe378
am: ed71873a1a  -s ours

Change-Id: I3586e09604b86192d52f3f453fbf1a01b04ccc2f