Merge "Allow vril-dump to work on user builds" into honeycomb-LTE