Merge "16k: set 16k boundary for shared libs" into main-16k-with-phones