Merge "Fix alphabetical ordering of HAL_INTERFACES_OF_INTEREST" into qt-r1-dev am: 0b15cb30c4
am: 27036ef10e

Change-Id: I3e36d42217aee94d54209e839e710f13f6f0b7d7