Merge "Update libandroidfw test package."