Merge "Allow installd to scan JARs in /vendor/framework." am: ee0348e8d1
am: d67c585333

Change-Id: I2be5f773b615a990d3cf4496d56294c61ab5cb34