Merge "Doc change: add note about future instruction set support." into froyo