Merge "Increase the level of depth of apk paths"
am: 401ace29db

Change-Id: Ib755f1646832df808f6abf8e0639aa39176502e0