Merge \"Revert \"libmraa: sync with upstream (SHA1: d336e9f)\"\" am: 2038aa86da Change-Id: I712f2d819b81372dba7e8abf0fd3054666f4e3e5