Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev