Merge changes Id2c62a6a,I20b288ea

* changes:
  Fix function pointer test for header-checker.
  header-checker: Cleanup Android.bp