Merge "Move one more libandroidfw header"