Merge "Move one more libandroidfw header" am: c5c74f9f49 am: e81eb61399 am: e1166dd488
am: 6d79e832fb  -s ours

Change-Id: Icc4c7600d2ce3f33dc7ed7f1e8bc2dbd0fbfec98