Partially revert of Upstrem prefs changes

Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs) that
worth keeping.

Original issue's description:
> Upstrem prefs changes
>
> BUG=507792
>
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
Committed: https://crrev.com/f78bbfd330ba31199cb4cdb7a52816b2bc492a6e
Cr-Commit-Position: refs/heads/master@{#367593}

[bshe, 2016-01-05 17:12:08]

Description was changed from

==========
Rebase to TOT

BUG=
==========

to

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

[bshe, 2016-01-05 17:13:48]

Description was changed from

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

to

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs)
that
worth keeping. 

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

[bshe, 2016-01-05 18:41:13]

The CQ bit was checked by bshe@chromium.org

[commit-bot: I haz the power, 2016-01-05 18:41:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1556383002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1556383002/20001

[commit-bot: I haz the power, 2016-01-05 18:44:09]

Description was changed from

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs)
that
worth keeping. 

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

to

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs)
that
worth keeping. 

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

[commit-bot: I haz the power, 2016-01-05 18:44:10]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-01-05 18:44:53]

Description was changed from

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs)
that
worth keeping. 

Original issue's description:
> Upstrem prefs changes
> 
> BUG=507792
> 
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792
==========

to

==========
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.

Note: this is a partial revert. There were changes (such as incorrect ifdefs)
that
worth keeping.

Original issue's description:
> Upstrem prefs changes
>
> BUG=507792
>
> Committed: https://crrev.com/1cffacd8f05734fae20c8816c3fc91abac5e38d4
> Cr-Commit-Position: refs/heads/master@{#363233}

TBR=battre@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507792

Committed: https://crrev.com/f78bbfd330ba31199cb4cdb7a52816b2bc492a6e
Cr-Commit-Position: refs/heads/master@{#367593}
==========

[commit-bot: I haz the power, 2016-01-05 18:44:54]

Patchset 2 (id:??) landed as
https://crrev.com/f78bbfd330ba31199cb4cdb7a52816b2bc492a6e
Cr-Commit-Position: refs/heads/master@{#367593}