Merge "Fix ApkLite parsing namespace" into sc-dev