Follow minikin header structure changes

Bug: N/A
Test: minikin_tests
Test: hwui_unit_tests
Change-Id: I2e3fd1a549fe3e9703d2ef93d03a5923005d4caa
5 files changed