Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp * commit '88e3f827e657ef741099b24896c17533fa9ef61e': Allow an alternate eri file.
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp * commit '88e3f827e657ef741099b24896c17533fa9ef61e': Allow an alternate eri file.