Merge "brctl: Add Android makefiles to build on Android"