Merge 0d649632dd090269000d1ccdd457c939d534cc9c on remote branch

Change-Id: Idffe4cf142d3c805063436b55f6de3bd11a9a3ce
tree: a07ed5ec078b08e5b9d7822f36b9f81ecacd4cb9
  1. config/
  2. drivers/
  3. include/
  4. Makefile