Merge "Fix ApkLite attribute parsing" into sc-dev