Bump to 3.6.1

Change-Id: I9c13531ebdf8d656dc13cd5c66380754a45dc4f1
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>