Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp * commit 'a2650db770e93a9424d6d6948fd31f943f6dac49': Fix SDK docs build.
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp * commit 'a2650db770e93a9424d6d6948fd31f943f6dac49': Fix SDK docs build.