Merge "libandroidfw_tests: package test data correctly"