Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev