Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d am: c74e158d am: 11fffe6f Change-Id: Iaf82b111d05d0414726943ed07e99110f6ecb47d