* changes: Fix prebuilt header files to produce proper AndroidMk entries. Reduce code duplication for testing the two header modules.