Merge "Move one more libandroidfw header" am: c5c74f9f49 am: e81eb61399
am: e1166dd488

Change-Id: I51b65b4eeea32af133ee9fb0528761d8fad2c5e6