enrc2b: remove merge conflict from AndroidProducts

Change-Id: I64252add305d43ed4b7d00455f839f852da7941a
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
enrc2b: fix spelling of dependencies

Change-Id: Id630bff6805aca2514754170927fd4b39dfe1b1e
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>