Merge "Remove redundant LOCAL_C_INCLUDES from fingerptint/Android.mk"