Merge n5x to AOSPA-LEGACY